From 6aa8941b849e194d88b050a9737d2c0b13a6b562 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 17 Sep 2010 00:18:20 -0400 Subject: [PATCH] Add annotations The goi scanner warns about these nowadays. --- gdk/gdkdevice.c | 3 ++- gdk/gdkdnd.c | 2 +- gdk/gdkvisual.c | 3 ++- gdk/gdkwindow.c | 9 ++++++--- gdk/x11/gdkdisplay-x11.c | 3 ++- gdk/x11/gdkdnd-x11.c | 3 ++- gdk/x11/gdkinput.c | 2 +- gdk/x11/gdkscreen-x11.c | 3 ++- gdk/x11/gdkvisual-x11.c | 4 ++-- gdk/x11/gdkwindow-x11.c | 3 ++- 10 files changed, 22 insertions(+), 13 deletions(-) diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index 19fa1dca65..5c62e091ae 100644 --- a/gdk/gdkdevice.c +++ b/gdk/gdkdevice.c @@ -830,7 +830,8 @@ gdk_device_get_n_axes (GdkDevice *device) * Returns a #GList of #GdkAtoms, containing the labels for * the axes that @device currently has. * - * Returns: A #GList of #GdkAtoms, free with g_list_free(). + * Returns: (transfer container) (element-type GdkAtom): + * A #GList of #GdkAtoms, free with g_list_free(). * * Since: 3.0 **/ diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c index b080ebebe0..695a5b2b7f 100644 --- a/gdk/gdkdnd.c +++ b/gdk/gdkdnd.c @@ -99,7 +99,7 @@ gdk_drag_get_protocol (GdkNativeWindow xid, * * Retrieves the list of targets of the context. * - * Return value: a #GList of targets + * Return value: (transfer none) (element-type GdkAtom): a #GList of targets * * Since: 2.22 **/ diff --git a/gdk/gdkvisual.c b/gdk/gdkvisual.c index 2be52af709..2501a09229 100644 --- a/gdk/gdkvisual.c +++ b/gdk/gdkvisual.c @@ -37,7 +37,8 @@ * * Call g_list_free() on the return value when you're finished with it. * - * Return value: a list of visuals; the list must be freed, but not its contents + * Return value: (transfer container) (element-type GdkVisual): + * a list of visuals; the list must be freed, but not its contents **/ GList* gdk_list_visuals (void) diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index c2fcb5a21f..a1f89f79b2 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -2468,7 +2468,8 @@ gdk_window_get_effective_toplevel (GdkWindow *window) * The returned list must be freed, but the elements in the * list need not be. * - * Return value: list of child windows inside @window + * Return value: (transfer container) (element-type GdkWindow): + * list of child windows inside @window **/ GList* gdk_window_get_children (GdkWindow *window) @@ -2488,7 +2489,8 @@ gdk_window_get_children (GdkWindow *window) * Like gdk_window_get_children(), but does not copy the list of * children, so the list does not need to be freed. * - * Return value: a reference to the list of child windows in @window + * Return value: (transfer none) (element-type GdkWindow): + * a reference to the list of child windows in @window **/ GList * gdk_window_peek_children (GdkWindow *window) @@ -2617,7 +2619,8 @@ gdk_window_remove_filter (GdkWindow *window, * The returned list should be freed with g_list_free(), but * its elements need not be freed. * - * Return value: list of toplevel windows, free with g_list_free() + * Return value: (transfer container) (element-type GdkWindow): + * list of toplevel windows, free with g_list_free() * * Since: 2.2 **/ diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 59c760051e..31f9ec12d7 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -2484,7 +2484,8 @@ gdk_display_supports_composite (GdkDisplay *display) * Returns the list of available input devices attached to @display. * The list is statically allocated and should not be freed. * - * Return value: a list of #GdkDevice + * Return value: (transfer none) (element-type GdkDevice): + * a list of #GdkDevice * * Since: 2.2 * diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 210cbaa252..6835a66483 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -3154,7 +3154,8 @@ gdk_drag_do_leave (GdkDragContext *context, guint32 time) /** * gdk_drag_begin: * @window: the source window for this drag. - * @targets: the offered targets, as list of #GdkAtoms + * @targets: (transfer none) (element-type GdkAtom): the offered targets, + * as list of #GdkAtoms * * Starts a drag and creates a new drag context for it. * diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c index ff69cebc1b..9c353af392 100644 --- a/gdk/x11/gdkinput.c +++ b/gdk/x11/gdkinput.c @@ -51,7 +51,7 @@ struct _GdkInputWindow * Returns the list of available input devices for the default display. * The list is statically allocated and should not be freed. * - * Return value: a list of #GdkDevice + * Return value: (transfer none) (element-type GdkDevice): a list of #GdkDevice * * Deprecated: 3.0: Use gdk_device_manager_list_devices() instead. **/ diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index 44abed2cc3..e3c0d74e9c 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -1410,7 +1410,8 @@ gdk_screen_get_active_window (GdkScreen *screen) * windows it contains, so it should be freed using g_list_free() and * its windows unrefed using g_object_unref() when no longer needed. * - * Return value: a list of #GdkWindows for the current window stack, + * Return value: (transfer full) (element-type GdkWindow): + * a list of #GdkWindows for the current window stack, * or %NULL. * * Since: 2.10 diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c index 2183294bdb..e984241824 100644 --- a/gdk/x11/gdkvisual-x11.c +++ b/gdk/x11/gdkvisual-x11.c @@ -521,8 +521,8 @@ gdk_query_visual_types (GdkVisualType **visual_types, * * Call g_list_free() on the return value when you're finished with it. * - * Return value: a list of visuals; the list must be freed, but not its - * contents + * Return value: (transfer container) (element-type GdkVisual): + * a list of visuals; the list must be freed, but not its contents * * Since: 2.2 **/ diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index aff986a4fa..59d412fd7f 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -3614,7 +3614,8 @@ gdk_x11_window_set_user_time (GdkWindow *window, /** * gdk_window_set_icon_list: * @window: The #GdkWindow toplevel window to set the icon of. - * @pixbufs: A list of pixbufs, of different sizes. + * @pixbufs: (transfer none) (element-type GdkPixbuf): + * A list of pixbufs, of different sizes. * * Sets a list of icons for the window. One of these will be used * to represent the window when it has been iconified. The icon is -- 2.30.2